Skip to content

[8.19] fix: resolve merge conflicts for elastic-agent-libs v0.33.1 backport#6461

Merged
swiatekm merged 2 commits intomergify/bp/8.19/pr-6441from
copilot/sub-pr-6454
Feb 27, 2026
Merged

[8.19] fix: resolve merge conflicts for elastic-agent-libs v0.33.1 backport#6461
swiatekm merged 2 commits intomergify/bp/8.19/pr-6441from
copilot/sub-pr-6454

Conversation

Copy link
Contributor

Copilot AI commented Feb 27, 2026

The Mergify backport of #6441 to 8.19 had unresolved merge conflicts in go.mod and go.sum caused by version divergence between main and 8.19.

Changes

  • go.mod: Resolved conflict by using elastic-agent-libs v0.33.1 and elastic-agent-system-metrics v0.14.2 (dropping the 8.19 HEAD versions v0.33.0/v0.14.0)
  • go.sum: Replaced old checksums for both packages with the updated hashes matching the resolved versions

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

…ibs v0.33.1 backport

Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com>
Copilot AI changed the title [WIP] Bump github.com/elastic/elastic-agent-libs to version 0.33.1 [8.19] fix: resolve merge conflicts for elastic-agent-libs v0.33.1 backport Feb 27, 2026
@swiatekm swiatekm marked this pull request as ready for review February 27, 2026 17:15
@swiatekm swiatekm requested a review from a team as a code owner February 27, 2026 17:15
@swiatekm swiatekm requested review from michel-laterman and ycombinator and removed request for a team February 27, 2026 17:15
@swiatekm swiatekm merged commit 079f880 into mergify/bp/8.19/pr-6441 Feb 27, 2026
9 checks passed
@swiatekm swiatekm deleted the copilot/sub-pr-6454 branch February 27, 2026 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants